#6 mostly done, waiting for #5