Still some work to do on this, but getting there!