Updating to what I'd consider v1.0