Done work on add logic