Updating the import policies command to the new way to the user policies (and somethong of the refactoring)
Fix a little error
Removing the TODOs... now works the user policies