Finished migrating one function to the new rulewrapper functionality