Finished stage 1 of redesign