reverts to Calculator as Algorithm unmatched and adding lightbulb

Change-Id: I87d13cfab8111fb75111f62005a311a20b53d45a