Added a tool

NOTE: Still a bug, fixing in progress