WIP
Complete the first iteration of the design.