Herp a Derp Guess I will just push this even with it still in a TODO phase