Expanded swing concepts. Making progress!