An updated take with some merge conflict resolves