[WIP] PropertyStream 2