Update: station movements and test LOCKING routines implemented