finish un-hardcoding jeremy