refactoring and moving code around
scoring
level up (not speed up yet though)