Refreshed project, added client code