Adding Database stuff, still much to do