Feature/assign to squad