Basic Refactoring.. Done
Menu! Woohooo!