Proposal/infrastructure chief

Ref #19, reopening and assigning to @flamsmark or @rrix to merge