adding in finals stuff
Merge branch 'divie_front'