Adding all the features for the 1.0 release