More formatting, and added an encounter