Assessment refactoring and question block in answer

See commit messages for specific steps taken