Finish initial implementation of new design