Added addition and subtraction operator overloading.
Removed a TODO.
Changed TODO comment.