fuckit, it's monday and I forgot to commit my changes so I dunno what I did here... Uh...
-stuff
-junk
-todo: more junk