Some merges + just making tests pass