Updating to 2.0.0-alpha1 and adding more basic features