Massive Database Structure changes. Needs Testing!