BROKEN Partially refactor to support multiple tares