Commented out some code that wasn't ready, just to have something live. Will require lots of revisiting in the near future.