Finish implementing fuels funcionality