Pushed where I'm at so I can work on it from a diff computer