Feature/jstricker/confetti