More work on files/setting up engine