Some refact. New testing scene.