Re-did schema to allow for something thats a lot more sensible and
easier to use for demonstration/tutorials