Dev 0.0.97 Some Moving Around