More work on kicking #1