updated with functions filling out still need work on remove function