Added Beatbox Functionaity

also,some code cleanup