Further changes. Need to find a way to do it without locking the whole damn thing.