adding the rest of my crap