Adding lots of blobs and fixing some naming