Hopefully resolving resources nicer now