improvements and such ---- so close to having everything working
together