Rearranging, removed vestegial TODO