Updated to use the new move function, as well as changing imports