Add voting, timestamps, some other stuff I can't remember
Add some files
Fix merge conflict