Need to change the macro to do something more like in the om next helpers: https://github.com/bhauman/devcards/commit/234a91d52210c68b0f73f9e8a1d7f1b70b549f15