ProjectContext makes this a little more organized, but it still doesn't solve the issue.