Pull Request Phase 2

Work has been partially done on Phase 2 with client data now getting displayed in a clients grid.