Incremental Upgrading to 3.0

I thought of some ways to speed up the development of release 3.0. I
will be connecting up the remaining functionality over the next few
commits. Progress can be tracked on Trello:
https://trello.com/b/8eHlqJEe