Finished most of the new design