Merge test5 into master (working stream compaction)

gooooooooooooo