Wow. Does that actually work? :)

Let me know if you consider this ready to merge.