Refactor

Updates to the demo app, putting calls to CMM on server side instead of client-based.