General updates to classes. Still a W.I.P.