Complete Rewrite of code + Sound