Added Player, worked a bit on Emitter