first implementation done
activities implemented but need urgent refactor