Proposed redesign and client

+1