Making quick commit for testing with Jenkins. At this point, most functionality with the EquipmentCalendar should be working.