The toolbar selection is now working awesomely. Still have to fix some logic issues.