Add somewhat working circles/bubbles implementation
Merged.