Jack - Updated things. Lots of them.