Add structure
stupid changes, will rebase soon