More work on target, and added eios...