hints from good Alexandra
more attic scenes
Resolve bad merge

Signed-off-by: David Silver <dms.silver@gmail.com>