Almost done - just final checks tomorrow