#27 - Changes required to make the generated code work properly.  Also
deleted some unused, older code associated with the animated watch.