Large logic updates, getting close