converted several things over to Path and stuff