added parse to project and added java essentials to model classes
resolve merge conflicts