more blobbing setup
got rid of commented out legacy code