fixing compilation errors, shelving this design, for now, though