TODO - logging
tidying up TODOs
Texture client locking
merged