Dev/begin redesign