almost done! everything working