Fixed how output is returned.
Fixed dictionary passing in base