Had some progress
Almost there