Finising up Target functionality

It's all on top of the new cool prototype from Tuesday