Massive modification

I've been forgetful with commits.