start fixing this up to be workable again if needed