Resolves #18 and improves activity tracking