Immigration Bill Taking Shape in Senate