[WIP] Begin Taker refactor
[WIP] Remove Offer::entry