watch for Units while checking solutions
Merge pull request #7534 from smichr/units

watch for Units while checking solutions