Refactored code to support rounds, cleaned up some of the old stuff