toward adding metadata...