Rework command system

Get things in a better order / setup