Push work from lab on friday
Fix merge conflict, push work from friday
's lab