Aviskree and roundstart vote

Added in the changes I made from the last repo