various changes, lets see if this compiles (it wont)