do not store measurement refs in track
Merge branch 'origin/dev' of into dev
seperated encoders and decoders
added todos for #35