Proposed redesign and client

Totally broken. Must fix.