Fixes #1

Also gets it ready to handle sharing text