Working on Moving functionality integration