More work on Augmentations, refactoring, cleanup, adding defines to make life easier, etc