modified gameplay, timer
merging conflicts..