parcelables now used everywhere
fixed running timer reset bug