Lots of code movearound for correct extent call
Removing extent logic