Some gameplay stuff and database
Merged master