ReturnTypeTool added

Plan to refactor this and make it re-usable by the Eclipse Plugin