Start on unifying everything into 6asm