got everything working hopefully