moved all kinds of stuff
Merge remote-tracking branch 'origin/master'
wrote a parser class