done some creep stuff, need to clean my classes asap