Mostly done

Spares not working
Ok, done

!