Quite a bit of rework, and compiled version now available