better formatting
Still working on the turn resolution stuff