Got both structures working