3_15_2013_1

More work on the calc popover