Improve the data model
Complete the current game