Begin work on header
Merge branch 'master' of https://github.com/puffball/freebeer
One more rearangement