added some classes and methods I mised in the prior commit