Initial split from launcher