Make this project suck less
This is more like how I would have done it...so I did it.