More work to commands
Merge pull request #3 from ryanguy426/Experimental

More work to commands (stable merge)