Progress

Moved forward a bit with commands (fixed some things as well)