* Was using onStart instead of onResume; shouldn't have been so fast to merge with master.