Cleaned up schema, set up print-testable join table