Re-added command stuff

This is a complete disaster.