Performance Issues

Work in progress