completed first round of work on boilerplates