Redesign proposal, close #14