[WIP] Improve Order Book tracking