Renames Facility, adds calculations to class
Merge branch 'Dev'
Updates data through 2/26