continuing to kill it
Merge branch 'divie_front'