Further work to implement build