more logic
Merge branch 'daveservergamelogic'