Getting a whole lot closer to having the toolbar self contained.