Began Refactoring out UI