Adding Eric's stuff to Main