Feature dump

OK, the other PR #57 got out of hand, so I'm just going to put everything in this one and merge it in for the first Play Store beta.