Working on improving profiling, testing.