WIP: More ring resizing changes