Re-Design WIP

by Adam Doyle