Slowly getting there. Work in progress