Started implementation of new design