Worked on client code structure.