Initial work on redesign.