TBD updates

by Adam Rossi