Okay, refactor so non rigid is an easy plugin

Still bad, though.