Minor refactoring to prepare for server-side images
More refactoring to prepare for server-side images
Fix text messaging (broken by last few commits)
Added server-side image (... I think)