Lot's of work on the commands