Finishing up first version of command constructors