[WIP] Closes #2136