merge
Update with new name.
Major rework, getting closer to 1.0.