Expand on Støvnengs work
Add conclusion file
Fix warnings