Refactoring
Imp dynamic plots and add test cluster notebook