Updated.

Minor problems left. Functionality looking great. Small organization
problems left