Added Profiles

(other minor changes made)
Test