Meta Data rewrite

Still in progress