Fair enough. I'll push a simplified version and let's see what @alex thinks about it.