Got everything working for now