Added default commands and put out some logic in helper classes