Added some stuff. Gotta fix some async stuff.