Hey Dominic

I've worked on the files a bit see the commit logs and my e-mail for more clarification.