Fuel commit 2

Potentially everything working