Refactored proposal. Enabled cancancan

Git diff leftovers