Not sure about that, @squirrelo, I need to take another close look at the schema.  Leave this for now, but let's not merge this until we hammer this out.