Part 2 working, some hardening complete, more to do