More Work on tools, added in Zephyr Start