Greatly improve performance and stability. Add basic load-tests