Full game commit, still needs tweaking