WIP: Adding some additional tools