[HW]	-- refactored facewall dao so it was more testable