Adding ability to add/remove to simulation