Final on the homework pull request

Well, it's working for the most but it's still really messy. I'm really excited about rails it seems to separate these things out more.