Removed Entity, and started doing the sound-play-thing
 merged dev and dev_AO