Adds PNGUtils and rewrites location controller