added Activities class
resolved merge conflicts