added from laptop
Merge branch 'refactoring'

refactored some shit