Not yet finished but it's another few steps forward