added a bunch of locks
moved a village
refactored the 5th scenario