Push to v206608

Rewritten the code again. Still has a little bug with fuel items, but
its executable now.