Something funny was going on here, I'm not sure if this is working
properly, but comitting anyways...I can always go back.