Working on locking and fault handler stuff