work in progress/ redoing things