Cleanup, initial work on reactive Rings effect