commented out some old stuff I won't be using