This is really cool :D Thought I was almost done and then I was here :/
Neatly solvable situation, no?