Slowly making progress on this…

Slowly making progress on this…