Fix/loss timeline

ready to merge, new timeline and analysis, still some minor bugs but it'll be great if @eightysteele can take a look before