Init bubble struct and changed function sigs