messing around with things
made a bunch of changes..