Everything I did on 1/16/13

everything up through the SubFunct stuff