wip: still broken, but closer