Movement done, some testing added