adding basic movement
merging