moved macros into common include folder.  started working on merging away one more kernel at the cost of a few extra multiplications, but running into some crashes...