First commit with new design