Updated for slightly more working version of the multi-file thingy