Ross checking in before pulling the working core data
Merge branch 'ross2'