Minor changes from earlier including commenting out boilerplate for now