I'm bad at committing often. Anyways, somewhat big design changes