moving tasks out of lib?