moved movable property in another class (somewhat crunchy)
clean up
clean up
clean up