o Rewrite most of the client based on the insight gained so far.