first stab at #4, need to update the toolbox as well