Almost done with zephyr