Wip

adding in new changes