Added almost all of end-game