Feature/proposals