Revert "continuing to break the tools... still trying to simplify down to the marker tool."

This reverts commit f34ece6bd64abc33be5731affc957ab420a06c63.
Revert "Revert "continuing to break the tools... still trying to simplify down to the marker tool.""

This reverts commit ade64a236f3bf4660ea3503baa56b5761be8cf91.