wip. still blocking issues