starting to add remove function, options and Ui need to be completed, but requires a big update