possibly broke things, major cleanup