Third attempt with no grunt errors. Modified some new files.