2/13/14

Almost done, need to fix a few things like updateDisplay