Yesterday
Reordered some ViewModel code, use Holo for M4