last commit

- logic exracted
- drawer exctracted