FIX: Move per-patch building mechanics