un-hardcoding some things