First try at modular commands.
Removed extra self when dispatching methods
Merge branch 'scott-linder-master'