Final commit I swear -- added author lists to be cool like colin