Gameplay Update 2

Check commits for details