SolrRequest refactor WIP

Whilst addressing some issues, like #38. WIP.
Line is too long. [89/80]