Started implementing new design