More work trying to ge everything up to scratch