Got the Calculator working