Made it all happen in line -- it should be much, much faster now