Moved everything out of Main. Still need to sort Round