More changes to polish up functionality
Wrapping this up to call version 1.0.0-beta