More to come once these two get their fingers out