Yeah, there are lots of things that don't work in this PR, it was just a "sketch" :) Working on a working version now.