added guice annotations
Tests for room and npctype, not donw but have git troubles so have to commit X_x