start refactoring
refactoring
get rid of junk
Merge branch 'refactor'