Refactor
Fix bib stuff and write some text
Formatting
Copy paste code
Merge code from Åsa, Anders and Niclas