Many updates... still working on exercise completed switch.
Merge remote-tracking branch 'origin/master'