More prototype work