@justinvdm could you review this? The placement here seems a bit odd.