Feature/better stories