More work.

3 of 4 features working on iOS.