I think I've implemented it correctly (if I got it right): https://github.com/danterolle/tilf/commit/f7ef6d2fa37b5659fb...

Thanks again!