removing TODOs
Merge remote-tracking branch 'origin/master'
starting work on colouring bubbles