More T&S coding
- Queries still not quite right