All the data
Moved some code,

Improved the output/.
Somewhat organized.