lost track of my work. cleanup needed. big commit