TODOs and trail layer assertions and extra handling