WIP: Switch to using a runnable. Schedule on threadpool