wip. take 2.