wip/elk/patches
