Updated with working copy of calculator program.