[WIP] Refactor Taker