Refactoring, work in progress Speed, huge speed increase