Fixed bug with ships targeting incorrectly from new sub code.
Added lots of TODO items