Working commit.
Working changes.  Added alternations for controller design.