Stefano v2

New Stefano stuff. I made a test file in case of whatever. I'll delete
it once I can.