Began implementing lock and renamed variables
Merged conflicts

Conflicts:
	src/js/actions.js