Closes #1495 (closed)
This needs reviewing on iOS and Android ideally.
I'll be doing some browserstack testing.