Added various new files
fix conflicts