Quick update. Still working on rspec issue.