simplify

move most calculations over to vb app