finally got everything working