Refactored proposal. Enabled cancancan

Not sure i got gist of Hmmm ? :)