Add draft support
Use appropriate helpers
Add flytrex live