Code to handle commands (v1, wip)
Merge remote-tracking branch 'origin/master'