WIP - profiler system refactor