Better shot at initial data structures