Added some new files, various changes