added utils.h as a macro definitions container
Swap ready for testing; requires a Strategy implementation
forgot to add strategy stub