Major changes
Major check-in; trying to sync up the latest code base