Repaired database stuff. Now on to new dev!