Committing some work as I am swapping to my laptop.