More lollipop, good grief. This is like 5 commits, squashed too much, better work ugh