Wip/meta

Ok about time we merged all this stuff.