changed the rpeortbuilder and reporttype and made the builder allow for
arguments to build a datasource as opposed to just allowing a datasource
directly