phase 1 changes

i really hope this works