class updates, NOT COMPLETE.