More WIP of base structs