Added some stuff that appeared to be missing. Not loading correctly now...