wip: redesign
chore: removes legacy stuff