Complete overhall of verb structure and processing
Also, added rspec