WIP tvl1 refactor