Moves things around and removed a lot of counts to fit under 37 line count