Ian 6-basically done