Week 1 work

Hahaha a ton of refactoring to do! 

Trying to create this in one script didn't work out so well, but I do have a better understanding of what needs to get done now.