Finished migration to structs. works