refactoring to use real parse.com data
reconciling maitris changes with mine