Stubbing out some new classes