All the refactoring. Add answer locking