Added movement but need refinment.