Merge branch 'panda-refactor' of https://github.com/sugarcubes/SugarCubes