Reworked most commands for v0.2