MAde changes to ActivityLogic, created ActivityGateway, merged something