I went slightly over the nominal 500 line limit - sorry, it was a lot more work than I expected and I kind of got carried away a bit. :-D
