Giving up on abstractions right now. Fix for later.
Single patch solution in progress
Likely final patch for MHD A'dam
Merge branch 'master' of github.com:mayhem/mhd-amsterdam