testing
added many functions, but haven't linked them together
Merge pull request #1 from eksoderstrom/client_branch

Client branch