Add remove, but still needs work