Move wrapper back.

Will write a new wrapper for the new model.
Merge pull request #136 from greboid/profilemanager

Move wrapper back.