Lotta changes... no thanks to git, but...

I’ll keep working on it, since the instructor wants it this way.