add everything working