Commands and Functionality
Bug squashing.