Most everything working
Bug fix