Added validations, voting, etc