moved most everything over from the spreadsheet