Refactored proposal. Enabled cancancan

Wrong message above. Ignore, please