Play around with fixing const
Remove double underscore from double-include defines
make invocations their own class