more schema changes; add availability calculations and more controllers