Refactored proposal. Enabled cancancan

Yeah me neither ;-) I'm sure this should be refactored further...