v2.0 proposal

Check out the example files to see how the implementation has changed and let me know what you think. And yes, I have tested it. :)