almost finished for pres
trying to pull from ashwins
changing some hardcoded things