Checking in the changes that work for now..