edited for bugs

Also if you could take a look at the internal tests when I tested this I would appreciate some insight on why it is failing. Link is here

Merge request reports

Loading