Rework [WIP]

:construction: