Feat/snappy cmd

Lets get these changes reviewed and merged in, makes things a bit more... "snappy" 
Ah, thanks!