Minor optimizations, added some todos for code review.  WILL NOT COMPILE
Added todos and minor cleanup due to code review