Work on #25

Still needs testing on mobile, but Should Work (TM).