Started over, removed old classes and rebuilt new Database Classes