WIP on NEW/DELETE macros. currently broken.