Finished with ordering and locking (for now at least).