More Refactor, building on Round class