Started work on making tools modular (ui and analysis)