Class Update

Getting things ready...