diff --git a/src/converters/dtsc2mp4.cpp b/src/converters/dtsc2mp4.cpp
index 6bb44f50..27e3c42e 100644
--- a/src/converters/dtsc2mp4.cpp
+++ b/src/converters/dtsc2mp4.cpp
@@ -18,341 +18,13 @@
 
 ///\brief Holds everything unique to converters.
 namespace Converters {
-  struct keyPart{
-    long long int trackID;
-    long long int size;
-    long long int time;
-    long long int len;
-    JSON::Value parts;
-  };
   
-  
-  bool keyPartSort(keyPart i, keyPart j){
-    return (i.time < j.time);
-  }
   ///\brief Converts DTSC from file to MP4 on stdout.
   ///\return The return code for the converter.
   int DTSC2MP4(Util::Config & conf){
-    DTSC::File input(conf.getString("filename"));
-    //ftyp box
-    /// \todo fill ftyp with non hardcoded values from file
-    MP4::FTYP ftypBox;
-    ftypBox.setMajorBrand(0x6D703431);//mp41
-    ftypBox.setMinorVersion(0);
-    ftypBox.setCompatibleBrands(0x69736f6d,0);
-    ftypBox.setCompatibleBrands(0x69736f32,1);
-    ftypBox.setCompatibleBrands(0x61766331,2);
-    ftypBox.setCompatibleBrands(0x6D703431,3);
-    std::cout << std::string(ftypBox.asBox(),ftypBox.boxedSize());
-    
-    uint64_t mdatSize = 0;
-    //std::vector<uint64_t> stcoOffsets;
-    //moov box
-    MP4::MOOV moovBox;
-      MP4::MVHD mvhdBox;
-      mvhdBox.setVersion(0);
-      mvhdBox.setCreationTime(0);
-      mvhdBox.setModificationTime(0);
-      mvhdBox.setTimeScale(1000);
-      mvhdBox.setRate(0x10000);
-      mvhdBox.setDuration(input.getMeta()["lastms"].asInt() + input.getMeta()["firstms"].asInt());
-      mvhdBox.setTrackID(0);
-      mvhdBox.setVolume(256);
-      mvhdBox.setMatrix(0x00010000,0);
-      mvhdBox.setMatrix(0,1);
-      mvhdBox.setMatrix(0,2);
-      mvhdBox.setMatrix(0,3);
-      mvhdBox.setMatrix(0x00010000,4);
-      mvhdBox.setMatrix(0,5);
-      mvhdBox.setMatrix(0,6);
-      mvhdBox.setMatrix(0,7);
-      mvhdBox.setMatrix(0x40000000,8);
-      moovBox.setContent(mvhdBox, 0);
-      
-      //calculate interleaving
-      //putting all metadata in a huge vector
-      std::vector <keyPart> keyParts;
-      for (JSON::ObjIter trackIt = input.getMeta()["tracks"].ObjBegin(); trackIt != input.getMeta()["tracks"].ObjEnd(); trackIt++){
-        for (unsigned int keyIt = 0; keyIt != trackIt->second["keys"].size(); keyIt++){
-          keyPart temp;
-          temp.trackID = trackIt->second["trackid"].asInt();
-          temp.size = trackIt->second["keys"][keyIt]["size"].asInt();
-          temp.time = trackIt->second["keys"][keyIt]["time"].asInt();
-          temp.len = trackIt->second["keys"][keyIt]["len"].asInt();
-          temp.parts = trackIt->second["keys"][keyIt]["parts"];
-          keyParts.push_back(temp);
-        }
-      }
-      //sort by time on keyframes for interleaving
-      std::sort(keyParts.begin(), keyParts.end(), keyPartSort);
-      
-      //start arbitrary track addition for header
-      int boxOffset = 1;
-      input.getMeta()["tracks"]["audio0"] = input.getMeta()["audio"];
-      input.getMeta()["tracks"]["audio0"]["type"] = "audio";
-      input.getMeta()["tracks"]["audio0"]["trackid"] = 1;
-      input.getMeta()["tracks"]["video0"] = input.getMeta()["video"];
-      input.getMeta()["tracks"]["video0"]["keylen"] = input.getMeta()["keylen"];
-      input.getMeta()["tracks"]["video0"]["trackid"] = 2;
-      input.getMeta()["tracks"]["video0"]["type"] = "video";
-      for (JSON::ObjIter it = input.getMeta()["tracks"].ObjBegin(); it != input.getMeta()["tracks"].ObjEnd(); it++){
-        int timescale = 0;
-        MP4::TRAK trakBox;
-          MP4::TKHD tkhdBox;
-          //std::cerr << it->second["trackid"].asInt() << std::endl;
-          tkhdBox.setVersion(0);
-          tkhdBox.setFlags(15);
-          tkhdBox.setTrackID(it->second["trackid"].asInt());
-          tkhdBox.setDuration(it->second["lastms"].asInt() + it->second["firsms"].asInt());
-          
-          if (it->second["type"].asString() == "video"){
-            tkhdBox.setWidth(it->second["width"].asInt() << 16);
-            tkhdBox.setHeight(it->second["height"].asInt() << 16);
-            tkhdBox.setVolume(0);
-          }else{
-            tkhdBox.setVolume(256);
-            tkhdBox.setAlternateGroup(1);
-          }
-          tkhdBox.setMatrix(0x00010000,0);
-          tkhdBox.setMatrix(0,1);
-          tkhdBox.setMatrix(0,2);
-          tkhdBox.setMatrix(0,3);
-          tkhdBox.setMatrix(0x00010000,4);
-          tkhdBox.setMatrix(0,5);
-          tkhdBox.setMatrix(0,6);
-          tkhdBox.setMatrix(0,7);
-          tkhdBox.setMatrix(0x40000000,8);
-          trakBox.setContent(tkhdBox, 0);
-          
-          MP4::MDIA mdiaBox;
-            MP4::MDHD mdhdBox(0);/// \todo fix constructor mdhd in lib
-            mdhdBox.setCreationTime(0);
-            mdhdBox.setModificationTime(0);
-            //Calculating media time based on sampledelta. Probably cheating, but it works...
-            int tmpParts = 0;
-            for (JSON::ArrIter tmpIt = it->second["keys"].ArrBegin(); tmpIt != it->second["keys"].ArrEnd(); tmpIt++){
-              tmpParts += (*tmpIt)["parts"].size();
-            }
-            timescale = ((double)(42 * tmpParts) / (it->second["lastms"].asInt() + it->second["firstms"].asInt())) *  1000;
-            mdhdBox.setTimeScale(timescale);
-            mdhdBox.setDuration(((it->second["lastms"].asInt() + it->second["firsms"].asInt()) * ((double)timescale / 1000)));
-            mdiaBox.setContent(mdhdBox, 0);
-            
-            std::string tmpStr = it->second["type"].asString();
-            MP4::HDLR hdlrBox;/// \todo fix constructor hdlr in lib
-            if (tmpStr == "video"){
-              hdlrBox.setHandlerType(0x76696465);//vide
-            }else if (tmpStr == "audio"){
-              hdlrBox.setHandlerType(0x736F756E);//soun
-            }
-            hdlrBox.setName(it->first);
-            mdiaBox.setContent(hdlrBox, 1);
-            
-            MP4::MINF minfBox;
-              if (tmpStr == "video"){
-                MP4::VMHD vmhdBox;
-                vmhdBox.setFlags(1);
-                minfBox.setContent(vmhdBox,0);
-              }else if (tmpStr == "audio"){
-                MP4::SMHD smhdBox;
-                minfBox.setContent(smhdBox,0);
-              }
-              MP4::DINF dinfBox;
-                MP4::DREF drefBox;/// \todo fix constructor dref in lib
-                  drefBox.setVersion(0);
-                  MP4::URL urlBox;
-                  urlBox.setFlags(1);
-                  drefBox.setDataEntry(urlBox,0);
-                dinfBox.setContent(drefBox,0);
-              minfBox.setContent(dinfBox,1);
-              
-              MP4::STBL stblBox;
-                MP4::STSD stsdBox;
-                  stsdBox.setVersion(0);
-                  if (tmpStr == "video"){//boxname = codec
-                    MP4::VisualSampleEntry vse;
-                    std::string tmpStr2 = it->second["codec"];
-                    if (tmpStr2 == "H264"){
-                      vse.setCodec("avc1");
-                    }
-                    vse.setDataReferenceIndex(1);
-                    vse.setWidth(it->second["width"].asInt());
-                    vse.setHeight(it->second["height"].asInt());
-                      MP4::AVCC avccBox;
-                      avccBox.setPayload(it->second["init"].asString());
-                      vse.setCLAP(avccBox);
-                    stsdBox.setEntry(vse,0);
-                  }else if(tmpStr == "audio"){//boxname = codec
-                    MP4::AudioSampleEntry ase;
-                    std::string tmpStr2 = it->second["codec"];
-                    if (tmpStr2 == "AAC"){
-                      ase.setCodec("mp4a");
-                      ase.setDataReferenceIndex(1);
-                    }
-                    ase.setSampleRate(it->second["rate"].asInt());
-                    ase.setChannelCount(it->second["channels"].asInt());
-                    ase.setSampleSize(it->second["size"].asInt());
-                      MP4::ESDS esdsBox;
-                      esdsBox.setESDescriptorTypeLength(32+it->second["init"].asString().size());
-                      esdsBox.setESID(2);
-                      esdsBox.setStreamPriority(0);
-                      esdsBox.setDecoderConfigDescriptorTypeLength(18+it->second["init"].asString().size());
-                      esdsBox.setByteObjectTypeID(0x40);
-                      esdsBox.setStreamType(5);
-                      esdsBox.setReservedFlag(1);
-                      esdsBox.setBufferSize(1250000);
-                      esdsBox.setMaximumBitRate(10000000);
-                      esdsBox.setAverageBitRate(it->second["bps"].asInt() * 8);
-                      esdsBox.setConfigDescriptorTypeLength(5);
-                      esdsBox.setESHeaderStartCodes(it->second["init"].asString());
-                      esdsBox.setSLConfigDescriptorTypeTag(0x6);
-                      esdsBox.setSLConfigExtendedDescriptorTypeTag(0x808080);
-                      esdsBox.setSLDescriptorTypeLength(1);
-                      esdsBox.setSLValue(2);
-                      ase.setCodecBox(esdsBox);
-                    stsdBox.setEntry(ase,0);
-                  }
-                stblBox.setContent(stsdBox,0);
-                
-                /// \todo update following stts lines
-                MP4::STTS sttsBox;//current version probably causes problems
-                  sttsBox.setVersion(0);
-                  MP4::STTSEntry newEntry;
-                  newEntry.sampleCount = tmpParts;
-                  //42, because of reasons.
-                  newEntry.sampleDelta = 42;
-                  sttsBox.setSTTSEntry(newEntry, 0);
-                stblBox.setContent(sttsBox,1);
-                
-                if (it->second["type"] == "video"){
-                  //STSS Box here
-                  MP4::STSS stssBox;
-                    stssBox.setVersion(0);
-                    int tmpCount = 1;
-                    for (int i = 0; i < it->second["keys"].size(); i++){
-                      stssBox.setSampleNumber(tmpCount,i);
-                      tmpCount += it->second["keys"][i]["parts"].size();
-                    }
-                  stblBox.setContent(stssBox,2);
-                }
-
-                int offset = (it->second["type"] == "video");
-
-                
-                MP4::STSC stscBox;//probably wrong
-                stscBox.setVersion(0);
-                uint32_t total = 0;
-//                for (int i = 0; i < it->second["keys"].size(); i++){
-                  MP4::STSCEntry stscEntry;
-                  stscEntry.firstChunk = 1;
-                  stscEntry.samplesPerChunk = 1;
-                  stscEntry.sampleDescriptionIndex = 1;
-                  stscBox.setSTSCEntry(stscEntry, 0);
- //               }
-                stblBox.setContent(stscBox,2 + offset);
-
-                MP4::STSZ stszBox;
-                stszBox.setVersion(0);
-                total = 0;
-                for (int i = 0; i < it->second["keys"].size(); i++){
-                  for (int o = 0; o < it->second["keys"][i]["parts"].size(); o++){
-                    stszBox.setEntrySize(it->second["keys"][i]["parts"][o].asInt(), total);//in bytes in file
-                    total++;
-                  }
-                }
-                stblBox.setContent(stszBox,3 + offset);
-                  
-                MP4::STCO stcoBox;
-                stcoBox.setVersion(1);
-                total = 0;
-                uint64_t totalByteOffset = 0;
-                //Inserting wrong values on purpose here, will be fixed later.
-                //Current values are actual byte offset without header-sized offset
-                for (unsigned int i = 0; i < keyParts.size(); i++){//for all keypart size
-                  if(keyParts[i].trackID == it->second["trackid"].asInt()){//if keypart is of current trackID
-                    for (unsigned int o = 0; o < keyParts[i].parts.size(); o++){//add all parts to STCO
-                      stcoBox.setChunkOffset(totalByteOffset, total);
-                      total++;
-                      totalByteOffset += keyParts[i].parts[o].asInt();
-                    }
-                  }else{
-                    totalByteOffset += keyParts[i].size;
-                  }
-                }
-                //calculating the offset where the STCO box will be in the main MOOV box
-                //needed for probable optimise
-                /*stcoOffsets.push_back(
-                  moovBox.payloadSize() +
-                  trakBox.boxedSize() +
-                  mdiaBox.boxedSize() +
-                  minfBox.boxedSize() +
-                  stblBox.boxedSize()
-                );*/
-                mdatSize = totalByteOffset;
-                stblBox.setContent(stcoBox,4 + offset);
-              minfBox.setContent(stblBox,2);
-            mdiaBox.setContent(minfBox, 2);
-          trakBox.setContent(mdiaBox, 1);
-        moovBox.setContent(trakBox, boxOffset);
-        boxOffset++;
-      }
-      //end arbitrary
-      //initial offset length ftyp, length moov + 8
-      unsigned long long int byteOffset = ftypBox.boxedSize() + moovBox.boxedSize() + 8;
-      //update all STCO
-      //std::map <int, MP4::STCO&> STCOFix; 
-      //for tracks
-      for (unsigned int i = 1; i < moovBox.getContentCount(); i++){
-        //10 lines to get the STCO box.
-        MP4::TRAK checkTrakBox;
-        MP4::MDIA checkMdiaBox;
-        MP4::MINF checkMinfBox;
-        MP4::STBL checkStblBox;
-        checkTrakBox = ((MP4::TRAK&)moovBox.getContent(i));
-        for (int j = 0; j < checkTrakBox.getContentCount(); j++){
-          if (checkTrakBox.getContent(j).isType("mdia")){
-            checkMdiaBox = ((MP4::MDIA&)checkTrakBox.getContent(j));
-            break;
-          }
-        }
-        for (int j = 0; j < checkMdiaBox.getContentCount(); j++){
-          if (checkMdiaBox.getContent(j).isType("minf")){
-            checkMinfBox = ((MP4::MINF&)checkMdiaBox.getContent(j));
-            break;
-          }
-        }
-        for (int j = 0; j < checkMinfBox.getContentCount(); j++){
-          if (checkMinfBox.getContent(j).isType("stbl")){
-            checkStblBox = ((MP4::STBL&)checkMinfBox.getContent(j));
-            break;
-          }
-        }
-        for (int j = 0; j < checkStblBox.getContentCount(); j++){
-          if (checkStblBox.getContent(j).isType("stco")){
-            std::cerr << "Part 1: " << ((MP4::TKHD&)(checkTrakBox.getContent(0))).getTrackID();
-            std::cerr << " Part 2: " << ((MP4::STCO&)(checkStblBox.getContent(j))).getEntryCount() << std::endl;
-            STCOFix.insert( std::pair<int, MP4::STCO&>(((MP4::TKHD&)(checkTrakBox.getContent(0))).getTrackID(),(MP4::STCO&)(checkStblBox.getContent(j))));
-            break;
-          }
-        }
-        /*MP4::Box temp = MP4::Box((moovBox.payload()+stcoOffsets[i]),false);
-        MP4::STCO & checkStcoBox = *((MP4::STCO*)(&temp));
-        std::cerr << checkStcoBox.toPrettyString() << std::endl;*/
-        //got the STCO box, fixing values with MP4 header offset
-        for (int j = 0; j < checkStcoBox.getEntryCount(); j++){
-          checkStcoBox.setChunkOffset(checkStcoBox.getChunkOffset(j) + byteOffset, j);
-        }
-      }
-    
-    std::cout << std::string(moovBox.asBox(),moovBox.boxedSize());
-    std::cerr << "Header Written" << std::endl;
-    //end of header
-
-    //mdat box making it interleaved
-    printf("%c%c%c%cmdat", (mdatSize>>24) & 0x000000FF,(mdatSize>>16) & 0x000000FF,(mdatSize>>8) & 0x000000FF,mdatSize & 0x000000FF);
-    std::map <long long unsigned int, std::deque<JSON::Value> > trackBuffer;
-    long long unsigned int curKey = 0;//the key chunk we are currently searching for in keyParts
-    long long unsigned int curPart = 0;//current part in current key
+    DTSC::File input(conf.getString("filename"));//DTSC input
+    MP4::DTSC2MP4Converter Conv;//DTSC to MP4 converter class will handle header creation and media parsing
+    std::cout << Conv.DTSCMeta2MP4Header(input.getMeta());//Creating and outputting MP4 header from DTSC file
     
     //initialising JSON input
     std::set<int> selector;
@@ -362,42 +34,14 @@ namespace Converters {
     input.selectTracks(selector);
     input.seek_time(0);
     input.seekNext();
-
-    while (input.getJSON()){
-      //std::cerr << "DataSize: " << input.getJSON()["data"].asString().size() << std::endl;
-      //mdat output here
-      //output cleanout buffer first
-      //while there are requested packets in the trackBuffer:...
-      while (!trackBuffer[keyParts[curKey].trackID].empty()){
-        //output requested packages
-        if(keyParts[curKey].parts[curPart].asInt() != trackBuffer[keyParts[curKey].trackID].front()["data"].asString().size()){
-          std::cerr << "Size discrepancy in buffer packet. Size: " << input.getJSON()["data"].asString().size() << " Expected:" << keyParts[curKey].parts[curPart].asInt() << std::endl;
-        }
-        std::cout << trackBuffer[keyParts[curKey].trackID].front()["data"].asString();
-        trackBuffer[keyParts[curKey].trackID].pop_front();
-        curPart++;
-        if(curPart >= keyParts[curKey].parts.size()){
-          curPart = 0;
-          curKey++;
-        }
+    
+    //Parsing rest of file
+    while (input.getJSON()){//as long as the file goes
+      Conv.parseDTSC(input.getJSON());//parse 1 file DTSC packet
+      if(Conv.sendReady()){//if the converter has a part to send out
+        std::cout << Conv.sendString();//send out and clear Convverter buffer
       }
-      //after that, try to put out the JSON data directly
-      if(keyParts[curKey].trackID == input.getJSON()["trackid"].asInt()){
-        //output JSON packet
-        if(keyParts[curKey].parts[curPart].asInt() != input.getJSON()["data"].asString().size()){
-          std::cerr << "Size discrepancy in JSON packet. Size: " << input.getJSON()["data"].asString().size() << " Expected:" << keyParts[curKey].parts[curPart].asInt() << std::endl;
-        }
-        std::cout << input.getJSON()["data"].asString();
-        curPart++;
-        if(curPart >= keyParts[curKey].parts.size()){
-          curPart = 0;
-          curKey++;
-        }
-      }else{
-        //buffer for later
-        trackBuffer[input.getJSON()["trackid"].asInt()].push_back(input.getJSON());
-      }
-      input.seekNext();
+      input.seekNext();//get next DTSC packet
     }
     //output remaining buffer
     return 0;