Merge with Aysegul and create activity saving to DB/server