Everything should compile now.  Still lots more clientside stuff to re add.