still arguing w/ the compiler over the mutex fix on top of my PR