2.0 updates

Just wanted to submit my current work as a PR to see what you thought.