have to fix grid movement