I should commit stuff earlier so Fippe can point out mistakes like this sooner