Nether factory merge!

This will need quite a few code reviews, since the merge was very awkward.