Adding some more files, working towards first battle test