Looks like it works. The examples are now a kludge, kinda.