Add a "beginner" diff button
Remove "locking" movement
More updating to rem
Update TODO