More changes - Might hurt u a bit CraigieBurn - Structured and new service methods