Game rules implemented
Merge udm into master