Working on automatically saving activity
Reorganising locations