A lot of work on passing data around. And commented out stuff.