Refactored proposal. Enabled cancancan

I don't much like the implicit conditions...