Got things to somewhat work