Proposed redesign and client

Specs for future tests. Removed.