WIP: Add a new struct