Preparing for 2018 Facility Modules