Still hacking together multiple files into one