Updated header, need to revise main