Initial version of wrap-cursor, think I still need to figure out fn-decl though