Make activity one

Please merge this branch into master