Fixed up Registry + COnfigurations
attempt to implement lock_guard<...>
Fixed up conflicts