Proposed redesign and client

Must do.