feature-lifecycle

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