WIP: Prepare for localising

Part of #243