Smoothing out client

Please read the bottom of the notes section, I have outlined what my
plans are to complete. Please feel free to add some to your section. I
plan to work on one main section at a time. Client should be close to
finished.