Quick and dirty conversion of client to use new object model.
Quick and dirty conversion of client to use new object model.

opentechinstitute/commotiond,opentechinstitute/commotiond,opentechinstitute/commotiond