Finally got structures right...