Work from 11/12/13

Added some buttons and stuff :D
-Colin