add fields for user, start moving javascript out of pages
use eager loading