working on fixing this
almost have it
almost have it