refactored into activities app