added all structures, WIP