lots of prep work changes..probably breaks stuff