Lots of commenting, partially solved boxes/circles issues, more on the way