Had another go at namespacing, can only learn by making mistakes! xD