Add some new files, misc changes + combat system