Proposed redesign and client

`\n`