Fixed trhings up so we can load the name asynchronously too