Refactoring a bit to make my game component based (yeah!).