First cut of gameplay updates, partly broken