Database rehauled. Relations (foreign keys) in place.
Test?