Added a few of Dans changed from his mine branch
Added some of Dans changes
added new schema changes
added magazines function
added new schema, fixtures and reverting to old solution