Should we add some kind of lock on this?