Cleanup
More work on blocks
Texture