everything working now...needs lots of polish