Lots O' Changes

lots of updates, thought we should merge before class tomorrow.... it appears the merge should be automagically delicious.