wip #5
Work on #6 - remove flycheck warnings