UNO: Added some switch statements to the code. As well as revised the refactoring list.