pulled in new boilerplate code in preparation for new code review