Version 3.0. (beta)

Work in progress, but we're moving master.next over to master now. This is a big set up updates and still could use some work, both trimming back and building up.