pushing this up because I want to change it all and see if it works...