Merge pull request #134 from greboid/profilemanager

Add ProfileManager
Move wrapper back.

Will write a new wrapper for the new model.