Starting to add the command support. Also trying to get the buttons to work correctly. Keeping it simple but the code isn't great. Will need to refactor over time.