major restructure to incorporate lessons from RR016