Added some more structure. Problems with insert statements in DB
removed accidental checkin