#6 Almost done, needs some tweaking. Game doesn't crash anymore, #8
hopefully