Fixing Main and `make run`

Yes I did break it embarrassingly in the reorganise branch...
Merge branch 'develop' into feature/skeleton-graphite