Commit 3. Stuff that was worked on in the lab, with the exception of
Lunings work.