Patcher mostly finished