Removed commands because they didn't work. Refactored.