Update for justin's latest

Pull down Justin's latest to the cheesie67 branch.