Logic is all in, however there seems to be a bug on add