Fixed duplicate adding and added basic addition handling.