2.0.0 WIP

Contains work to be included as part of version 2.0.0.