Allow changing targets at runtime
Merge branch 'stuff'