Added arrow assets.
Removed some TODOs that were TODONE