Refactored for decoration, tests pass, demo passes except for description change on ADJ.