Lots of little build progress, including angular and data