A bunch of uncommited changes i had sitting around.