- working on making things thread safe