Add basic scaffolding for fix.