Work in progress movement

Very raw code