Checking in working changes for now