Added modular tools (+ a few things)

Added modular tools (+ a few things)