refactor and working on run

refactored 09, 10

Working on 12