Should this be done in two separate packages?
Activity