Working

Hi Yosep, 

This should all work although it's a bit messier than it should be. Haven't had a chance to refactor it.

Best Regards,
Riaz Virani