Did some code refactoring and moving around. Working on making code more streamline in the next update.