Major update to round robin... Logic should be complete