Metadata - Second Iteration (Incomplete)

- worked on #123