Pretty much complete.  Should have committed more.  :)
Comments and tweaks