Refactoring completed. Performance issues emerged, ongoing profiling
Refactoring completed. Performance issues emerged, ongoing profiling


Former-commit-id: 2af204efeae08e37c2f0a090372dacd6d07361c1
radical-experiments/AIMES-Swift,radical-experiments/AIMES-Swift,radical-experiments/AIMES-Swift