More work on Scene re-write (static registration is messed up now)