new round system implemented ( fix #9 )

Implements new round system. Legacy code kept commented out. Still some bugs to work out.