Modified demo to work with marker user
Added marker template for assessments