server TODOs added
Merge branch 'master' into marc
Moved parseline to helpers
updated server side stuff