Additions and updates to source as part of Milestone 2.0.0.