before remote merge
adding eddystruct
adding misc
fixing some merges