Cut out 300 lines of fat.  Lots of redundant code stripped out.  Should be fully functional again though?