Refactoring and ignore
Implemented a status table and refactored a switch
Major reformatting