adding in a bunch of crap