JAL-1332 TODOs before prototype is finished