Feature/respect ordering

Snappy provides an order of content, we're currently ignoring that. This fixes that.