more additions, making everything metadata