Got calculation working with current code.
Fixed issue in computation form where remove buttons would disappear on validation error.