Finished the analyzer overhaul