Completed locking and stats parts