Feature/content repository almost done!