contuing to work on layout
Merging waffles into master
Merge branch 'waffles'
Working on montage animation