Almost completely back working again with better indentation visitor.