Lots of work done - more to come

And can I just say, I hate working with static/non-static. It's a pain
in every way.