Implement minimal redesign

Signed-off-by: Stephen Finucane <stephenfinucane@hotmail.com>