Completion of Calculator