Feature/sh metadata tj

Hopefully this resolves my rebase hell...