Revert "Revert "i'm working""

This reverts commit 209593ee696c02de7a472815c6b61feb87e3ab83.
im working on this iisue

i/ looking in into this