fuel report + refactoring
wip: refactoring
dispatch form 2.0