Ready to merge with player and match for initial test and debug
merged