Added profile functionality
Fixed merge conflicts