2.1.0 WIP

Contains all of the changes to be included in v2.1.0.