moved some stuff around...
new script isn't working yet