Should now compile!

next step big clean up!

#mark123mark