Will now match indentation across empty lines

Rewrote much of the logic, simplifying most of it