An intermediary commit: Cleaning up the wrapping a little bit, renamed some methods, and working on getting the recurrent decorator working (WIP, so some of the tests are a bit screwed up right now)