working simple case; master compute still very ugly and hacky