merge
stash
added more structs