Many changes; much wow

I'm actually not proud of these bulk commits,
but this is a project for school so I don't care! xD