Checking in latest working code.