lots of changes to gameplay
merging