added classes to facilitate saving profiles
fixed merge conflicts
Fixed some errors that JUDAH made