Preliminary code for movement revamp