Basic gameplay complete, still need to fix special cases