Turn every method into command

Moved #3 on top of upstream master for easier merge.