headers, reorganizing
added haymaker alias