Merge pull request #11 from spderosso/master

some run cmds
Merge pull request #12 from spderosso/master

todos + some cleanups
A bunch of fixes to the model
cleanups in run cmds + removed unnecessary 'to in Server'