New model spec into modals
Modularizing, restructuring components
Katie's Modal Changes
DB Controller changed for new JSON format
Merge branch 'katie'
reports update 3-27
Merge branch 'reports-ongoing'