Fixing up targeting of code. Need to refactor a bit.