cleaned up code a bit, stubbed out some things that need to be done