fleshed out some class frames
resolved conflict