feature-lifecycle

- [x] - #19 
- [ ] - #7