Changed code for calculation scoping.. Return can now use parameters as well as local declarations, but no global