Some more work on toolStrip, not quite finished yet.