Began thinking about refactoring; stopped myself for now... -.-