de/remod going to go into the TOD structure, cleaning up interfaces
going to put in some cbass stuff