Majority of circles functionality added