More changes
More progress
More progress
Added splice back in