Add is now working, remove in progress.