-commented out some unused code, some of it seems to mirror a few funcs in util.py?