Worked a bit, nearly done