Removed old predicate junk
Another attempt at getting macros to work out