Working Commit

99% Unit Tests working. Still unable to delete a client. All other tests
are working