Cleaned up the interface a bit.  Changes to accomodate new API.
Functional front end done.