Added TJ's stuff

For meeting