Feat/snappy cmd

Lets get these changes reviewed and merged in, makes things a bit more... "snappy" 
One nice thing about the DOut though, is that its easy to search for and replace :P