#60 - This should do it

Tried something that didnt work and had to roll back some of the changes