Version 2.0 ready

Featuring a lot of new features, of course.