wip
wip
wip: start of big redesign