One row header

Initial changes to fix #451