not sure what is messed up. Added several methods; broke a few things