working on fixing setup.js
removing old setup files, moved to models/setup
probs going to break things
bad conflict solution