Further work on Toolbar class - currently nonworking