Fixes, Initial commit of API Tool