cleaned up code, created objects, new db tables