Made a start on breaking out stats into their own object