significant refactor to address relative includes