I think I'm done, except for the 2 inches betw functions

But probably there will be some more changes I don't recognize yet.