Adding in remove and add tool functionality to the manager. Implements #118.