Added some crap that i'm going to clean up (take out again) and recommit
with