OSS will likely be moving in with us