CANDIDATE FINAL. Supply changes to work with each floors and surgery/service mapping. Sent to Guylaine for final ER