Add lock and stuff