Proposed redesign and client

fixme