fixed until round circling worked
merged view so the working model is in the model branch