merged gameplay next branch