Fix an over-zelous find and replace
Get toaster working w/ polling. Need to update to be event driven.