Refactoring shake vars, moving more th Chione.