Assessment refactoring and question block in answer

See commit messages for specific steps taken
@dragonfi I think you missed my question here