bulk changes, trying to get this to build