final rspec passing. merging with upstream next