todo rspec complete
made merge changes