Got basic add, remove, edit, toggle working again