added updates from velo project; began developing header functionality