Added initial code to some classes