Conflist redesign

by Anthony Killeen