Less support

This is a rebase of the earlier pull request of the same name. It does not fix the issues mentioned in the request. That will follow in a separate request.

Running ```bundle exec rake``` to run the tests results in two failing tests, but both of these test also fail on master.