Adds #8 & #9 - player view
merging conflicts