getting closer to handling metadata correctly but there's still a lot to do