still working on fixing move