started replacing markup with templates, added in progress properties, methods and param table