Moved officer/common location from data to program class