Started Calculator and added TODO items