Revert "Revert "Halls of Lightning overhaul""

This reverts commit ecebd69e80e441e2dc2389d32c52e06275f1c644.