Feel free to edit this PR to match the conventions used in this repo. I tried to figure out, but maybe somewhere I didn't get right.