Terrible time to commit, or rather i did a bad job of refactoring and everything is muddled right now.