Drain fill area mostly done

A ton of testing is need for this to confirm that it works. However, for
now its done enough to place in a release.