Feature/cdodge/add a mixed modulestore