still working on add feature