Tweaked bubble creation, added state queue etc

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>