much cleaner. more rspec issues.