refactor levels 1-3
Merge branch 'eugene'